Skip to content

Conversation

compiler-errors
Copy link
Member

Not sure why it was doing a whole dance to re-match on the token kind when it seems like Lit::from_token does the right thing for both macro-arg and regular literals. Nothing seems to have regressed diagnostics-wise from the change, though.

Fixes #112622

r? @nnethercote

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 15, 2023
@nnethercote
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 15, 2023

📌 Commit 9ef580f has been approved by nnethercote

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 15, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 16, 2023
…nnethercote

Handle interpolated literal errors

Not sure why it was doing a whole dance to re-match on the token kind when it seems like `Lit::from_token` does the right thing for both macro-arg and regular literals. Nothing seems to have regressed diagnostics-wise from the change, though.

Fixes rust-lang#112622

r? `@nnethercote`
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 16, 2023
Rollup of 7 pull requests

Successful merges:

 - rust-lang#112163 (fix: inline `predicate_may_hold_fatal` and remove expect call in it)
 - rust-lang#112399 (Instantiate closure synthetic substs in root universe)
 - rust-lang#112443 (Opportunistically resolve regions in new solver)
 - rust-lang#112535 (reorder attributes to make miri-test-libstd work again)
 - rust-lang#112579 (Fix building libstd documentation on FreeBSD.)
 - rust-lang#112639 (Fix `dead_code_cgu` computation)
 - rust-lang#112642 (Handle interpolated literal errors)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c2e1097 into rust-lang:master Jun 16, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 16, 2023
@compiler-errors compiler-errors deleted the interp-lit-err branch August 11, 2023 20:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ice: unreachable expr.rs
4 participants